From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 27 Mar 2011 17:09:26 +0000 (+0000)
Subject: Swap 2 "and" for "&&"
X-Git-Tag: 1.31.0-rc.0~31160
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=d193b03c81f23315fdde4c80280be21b68c70453;p=lhc%2Fweb%2Fwiklou.git

Swap 2 "and" for "&&"
---

diff --git a/includes/User.php b/includes/User.php
index 8cf872d7ff..996a02c92a 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1476,8 +1476,8 @@ class User {
 	 * @return Int The user's ID; 0 if the user is anonymous or nonexistent
 	 */
 	function getId() {
-		if( $this->mId === null and $this->mName !== null
-		and User::isIP( $this->mName ) ) {
+		if( $this->mId === null && $this->mName !== null
+		&& User::isIP( $this->mName ) ) {
 			// Special case, we know the user is anonymous
 			return 0;
 		} elseif( $this->mId === null ) {